Icon theme: Hardcode fallback through the 'gnome' icon theme

This is what we used to get through the Net/FallbackIcontheme
setting. Nobody has ever set this setting to a different value,
and people have come to rely on GTK+ applications getting their
icons this way.

diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 3fe95e77d153256bd7e989278ff495543e299acc..5061cfed6d735c7c679f4f43a3de17d6f58822dd 100644 (file)
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -1255,7 +1255,12 @@ load_themes (GtkIconTheme *icon_theme)
   if (priv->current_theme)
     insert_theme (icon_theme, priv->current_theme);
 
-  /* Always look in the "default" icon theme */
+  /* Always look in the gnome and hicolor icon themes.
+   * Looking in hicolor is mandated by the spec, looking
+   * in gnome is a pragmatic solution to prevent missing
+   * icons in GTK+ applications when run under, e.g. KDE.
+   */
+  insert_theme (icon_theme, "gnome");
   insert_theme (icon_theme, DEFAULT_THEME_NAME);
   priv->themes = g_list_reverse (priv->themes);